# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1239.1.8 -> 1.1239.1.9 # arch/ia64/kernel/perfmon.c 1.59 -> 1.60 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/09/15 eranian@hpl.hp.co 1.1239.1.9 # [PATCH] ia64: minor perfmon2 patch # # This patch fixes a typo in pfm_write_pmcs() in the test for the default # value. The code was using the lop index instead of the register # index in the PMC_DFL_VAL() macro. This was causing valid values # for some PMCs to be rejected. # -------------------------------------------- # diff -Nru a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c --- a/arch/ia64/kernel/perfmon.c Fri Sep 19 00:40:13 2003 +++ b/arch/ia64/kernel/perfmon.c Fri Sep 19 00:40:13 2003 @@ -2905,7 +2905,7 @@ * - system-wide session: PMCx.pm=1 (privileged monitor) * - per-task : PMCx.pm=0 (user monitor) */ - if ((is_monitor || is_counting) && value != PMC_DFL_VAL(i) && PFM_CHECK_PMC_PM(ctx, cnum, value)) { + if ((is_monitor || is_counting) && value != PMC_DFL_VAL(cnum) && PFM_CHECK_PMC_PM(ctx, cnum, value)) { DPRINT(("pmc%u pmc_pm=%ld fl_system=%d\n", cnum, PMC_PM(cnum, value),